From: Gabor Juhos <juhosg@openwrt.org>
Date: Fri, 21 Dec 2012 18:25:40 +0000 (+0000)
Subject: flashrom: remove broken msr path change
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=1992a2b19f7dc8023ad263358fb706b81bf87a3a;p=openwrt%2Fsvn-archive%2Fpackages.git

flashrom: remove broken msr path change

This almost caused a nasty accident on my Geos — without the MSR access
it managed to erase *most* of the flash and write the new image, but
didn't manage to change the last few KiB. Thankfully I'd already taken a
copy of the old contents, and could flash them back.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34832
---

diff --git a/utils/flashrom/Makefile b/utils/flashrom/Makefile
index 354b9919a..c5f8dc19d 100644
--- a/utils/flashrom/Makefile
+++ b/utils/flashrom/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=flashrom
 PKG_VERSION:=0.9.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.flashrom.org/releases
diff --git a/utils/flashrom/patches/001-msr_dev_path.patch b/utils/flashrom/patches/001-msr_dev_path.patch
deleted file mode 100644
index d018c72b0..000000000
--- a/utils/flashrom/patches/001-msr_dev_path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/physmap.c
-+++ b/physmap.c
-@@ -352,7 +352,7 @@ int setup_cpu_msr(int cpu)
- {
- 	char msrfilename[64];
- 	memset(msrfilename, 0, sizeof(msrfilename));
--	snprintf(msrfilename, sizeof(msrfilename), "/dev/cpu/%d/msr", cpu);
-+	snprintf(msrfilename, sizeof(msrfilename), "/dev/msr%d", cpu);
- 
- 	if (fd_msr != -1) {
- 		msg_pinfo("MSR was already initialized\n");
-@@ -362,7 +362,8 @@ int setup_cpu_msr(int cpu)
- 	fd_msr = open(msrfilename, O_RDWR);
- 
- 	if (fd_msr < 0) {
--		perror("Error while opening /dev/cpu/0/msr");
-+		fprintf(stderr, "Error while opening %s: %s\n", msrfilename,
-+			strerror(errno));
- 		msg_pinfo("Did you run 'modprobe msr'?\n");
- 		return -1;
- 	}